Clean method moved to controller. nextTick calls removed