Removed unused code
Updated submodules