Prevent model loading too early, remove some unused code.