[MD] - Cleaning up some commented out methods