Started to clean up