bunch of cleanup