Clear out some now irrelevant code. Explicitly state some dependencies
that were inherited from removed POMs.