remove commented out stuff. I suppose that we've moved to GBR for good