attempt second angular cleanup
please work once and for all