Remove transfer complete stuff and everything added in my previous PR for new stuff