clean up
db design initial