Cleanups on models