Code tidy up. Upgrade to latest Spring versions and use new iO APIs. Simplify persistence to MongoDB.