Remove unneeded fields
Fixing create tables
Adding some comments