Removed unnecessary parts of the code
Removed more unnecessary stuff. Also small bug fix for transferring