cleaning up the receiving side of things