Databases cleanup
#include options.h not needed anymore