Clean up decorators and models