model cleanups