Remove unnecessary switch case Facade

For easy maintenance.