Fix broken u_a_a spec, remove comments