Got rid of everything concerning the databases for the master branch