remove old context functionality