Removed all Quad typedefs but one