More Cleanup and Removed Support on MongoDB.