Revert "more reintegrating loops and cleaning up - also fix - TBD: make...

Revert "more reintegrating loops and cleaning up - also fix - TBD: make upsampled work again - select only for correct filters"

This reverts commit efe4596e.