Cleaning for submodules
Messy merge