Remove some inherited stuff for now