Removing old library code
Modified submodules