Remove unnecessary switch case Facade