Removing code to move up inheritance chain