Remove fallback context as it's simply not needed