Fixed some more controller issues and removed some unnecessary parts from the calibratcontroller scene