Removed unecessary usage of overrides.