Loads of code cleanup += animations!