Removed unnecessary contexts