cleanup obsolete code
Revert "cleanup obsolete code"

This reverts commit 7077039ef752f746f7afb72009cd495489440942.
adding mongoshell output
refactoring options related code