Cleaned up redundant models, add admins and investigators.
Cleaned out more redundant models.