[animeultima] Tidy up of the unnecessary code before bed. No real change since last commit.