cleanup task model internals a bit