Remove Decorator class
Cleanup