fixes remove animation
cleans up code/comments