register module cleaned up