Deleted Facade class
fixed merge issues