Remove dependency of GBToolbox (and JRSwizzle)