Cleaning up recipient code