removed unnecesary context information from some functions