Removed unecessary returnToSender
General Fixes