Fix for rotate issue breaking animation

Minor refactor of strings, and removal of dead code