I'm not sure removing functionality is acceptable ...