Remove remaining code complaints in PhpStorm