removed some unessesary noselects