Cleanup for remake on the Angular branch part 10 (final for reset)