cleanup
take out Mongo specific naming