Cleaning up more MD