Removed unnecessary switch