Removed pointless switch statement