removing unnecessary context class