Fixed 'Clean-up'

Re-Created the fixed version, removing the hack, this time focusing on
animating what we wanted to be animated.