Change database name, remove unused code