Remove panic handling - which isn't needed anymore and didn't work well