Cleanup various fix me refs Upstream-commit: ffbd8fe5b9a5913c8336045c7b25c848c53f783d Component: engine