more ui-router fixes, more old code removed, more things work