Cleaning the Goto feature