First fixing (removal of outdated database stuffs)