cleanup, adding xpd