Remove transfer functionality, misc. simplifying