Cleanup after revert of Initial Gyroscope support