cleanup for cddsearch feature additions