Module usage cleanup