Clean up some modules