Write spec, add translation, remove unnecessary code