Cleanup for remake on the Angular branch part 2