Clean up and move to proper spot