Feature clean up angular

Cannot review.