Fixing some issues with animateRemove option