Tidy switches, remove underused implicits