Animation work, cleanup