#552 - Removed extraneous subclass overrides