Tidy up remove events