improved utility classes
improved data source initialization utility classes
removed unused classes