Rotation fix and removal of unused files