change order of removing objects and switching to action