some initial work on proper module cleanups