Removed unnecessary function overrides