Removed all Quad typedefs but one
Isolated detection