Cleanup of compiler noted issue