Removed resources
Merge from pull
Removed unused facade
Removed unused facade