Took out redundant cases