Fix facade
Remove now unuseful uses