Cleaning up configuration files and queryStatements handler