Remove pointless transformation, fix specs