Making minor changes for clearing context