deleted an unused file and small refactoring
database support, fixed unicode errors and other minor issues