Added missing deactivation/reactivation methods
Removed legacy MongoMatchers
Fixed deprecated code