Clean up of the DB Model

This huge pull request goal is to get a cleaner DB model. We store less information in the database but we can still get the useful information stored.