remove TransferFragment and refactor code