moved stuff around
Merge branch 'clean-up' into db