Remove more angular cruft