Removed extra context set calls