Unused import
Eliminated duplicate database fetches