moved toremove away, moved db schema