Remove Symfony upgrade files.
Simplify findById.