cleaning up transfers functionality