Started to cleanup