utils cleanup

Fixed broken package names
Removed some too-specific methods