cleaning up sub modules
fixing more mess