Some cleanup with USE_XRANDR flag