Some model cleanups