Remove decorator facade