Story 40306505: Cleanup for newly created model, needed post refactor.