cleaning up some modules
further cleanup
merge