cleanup HD/Favorite logic