Cleaning up sub modules