cleaned up model saves and whatnot