Big time cleanup on dependencies and db models.