Module chome code cleanup