Started removing and moving receiver functions