Database improvement

Database clean