partial removal of deimos, rest will be removed in next commit
added new x11 wrapper