Some module clean up