Updated submodules; removed unused