cleaning up unused code in DatabaseHandler