Revert "Add removed metric as second parameter for removal listeners."

This reverts commit 27625286aa96a77b185ff2bba9222460cd0ffbd6.