Rotation fix shouldn't cause any errors anymore

Rotation fix is already disabled on 1.8 or higher
Cleanup and fixes