db and models dir clean up