lots of cleanup
change require