Module variable clean up