removed unnecessary filters and two way bindings