Remove-x11-support. Additional cleanup