-#%ncancelled_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
-%all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
+@cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
+ if $conf->exists('hidecancelledcustomers');
+if ( $conf->exists('hidecancelledpackages' ) ) {
+ %all_pkgs = map { $_->custnum => [ $_->ncancelled_pkgs ] } @cust_main;
+} else {
+ %all_pkgs = map { $_->custnum => [ $_->all_pkgs ] } @cust_main;
+}