horde: cleanups from rawhide