Unify the "detach" and REMOVAL_EVENT handlers to one "remove" function.
Old functionality is preserved, for the moment.
Signed-off-by: NDominik Brodowski <linux@dominikbrodowski.net>