Remove var_dump and unneeded identity check