remove legacy context based exception handling