Remove context middleware per Ritchie