add a forgotten break and remove some unused imports