Update for some UI, cleanup of Mongo entities.