Unused import
Simplify code by eliminating short switch