Dropped a whole load of stuff that no longer have a submodule mapping defined.