Clean up the upcall receive pipeline
Working