Removed mock, mox3 from dependencies. Code polishing