unused utils removed, packages cleaned up