model: Cleanup again