Cleaned up Model references