Finish removing extra xorg calls by default