strip down some old code
some housekeeping
partial update away from mongo