Work on streamlining the DB schema more, remove unwanted tables