Added remove listener functions.