modules clean up