cleanup
modulegen, try 2