file cleanup
Db schema