[MD] - Cleanup on deprecates