r600g: clean up some code from move to new paths.