More failure removal

CC #43