Removed extra context variable