Code cleanup, After transfer status