Fixed small bug on removal and sending emails