Removed rests of old submodule