Removed un-needed extends