clean-up on recv.cpp
cleanup in recv.cpp
Merge branch 'Emily'