context: remove deadlock