Some clean up of models