Remove #57 as it's done