Fix database bug and rm database.yml