Revert 47d444a..ae36fcf

This rolls back to commit 47d444ad9ed3d0f7eb1dc353ec92e572354203f8.
Revert 24babfd..66b2abd

This rolls back to commit 24babfd6885cdc8b5ac3ccc5b2e293d6d9d24a7c.
tidy up poms.