More module cleanup.