started cleanup
continued cleanup