Cleanup some of the Angular based upon new knowledge