fixed mongo id cruft...
removed line of code added TODO.
minor cleanup