More failwith removed