Cleaned up more models