remove notorm, Db fixes