Remove unnecessary Select