removed cbp2make and xdg