removed unused hook and updated contexts envs accordingly