first bit of cleanup
all of the removes