removed unnecessary filtering