Setup adjusted. Unused import removed.