Removing the more complicated overrides