Start cleaning up

Remove some of the model class and adjust some others to follow the
change we want to do in the database.
Add upgrade sql script cleaning up the database for release 0.6.1