We don't need this catches for a long time now, we should remove them