Removal listener changes