removed unnecessary context arg