Some cleaning up
Remove unused submodules