More module cleanups