cleaned up some modules