angular / ui cleanup