Removed Scaling code