Clean-up of abandoned sub-modules left in first commit.