Fixed removing Facade