Removed unused code, and removed filtering option on scope. (It didn't work anyway)