Address spec, cleanup