Removed override tags to fix build issues