bug fixes, animations should be removed properly now.