module cleanups