Remove code that is now in superclass (2 TODOs)