Cleaned up extra models