All the clean up gyro changes