Db schema cleanup