Revert "Added Context"

This reverts commit 8493c81cd97f99c183f75053857965a05d798d1d.