Remove Goal Orientation Scale and Add Factored Scaling