refactoring

- depending on condition 'withFilters' moved in one place;
- removed unused code ("trash"-code)