Clean up user decorator, model, and specs