Remove never possible null return values