Cleanup of @app/models