Cleaning up submods