Fix for issue #1457
Merge pull request #1484 from jjettenn/master

remove unused/necessary code
Merge pull request #1483 from erwinwinder/master

Fix for issue #1457
W.I.P complex filters.