Cleanup decorators