removing the context as it causes problems