pretty much done with the manual cleanup here