Changed: projection instantiation cleanup