Old search code removal (bug 880767)