Added option to remove animation