Remove all six related fixes

I don't use it since it is ugly.