Revert "Check that collectpads exists before removing pad"

This reverts commit 8e6b876e76c94410db160afe5eb30f21452e419f.

Depends on a core commit that was reverted
6 files changed