Remove GDIRTY_COLOR tests and other cleanup, Add variable for stats separator