Removed more extra circs classes