cleaning up transfers functionality
Merge pull request #572 from vishwasbabu/develop

cleaning up transfers functionality