Remove unused and commented import
Remove commented deprecated code
Include ZP only for those filters we have calculated the ZP