LOTS of cleaning up, fixing Mongo schema