Minor change, remove redundant switch