small module cleanup