remove decorator pattern