Cleanup from PHPStorm analysis of view