Cleanup from PHPStorm analysis