Various cleanup for model refactor