Städat upp mer databaskod
Merge branches 'master' and 'cleanup' into cleanup
Merge branches 'master' and 'cleanup'