Cleaning after db structure Fixes #3