Cleaned up utils

Removed old functions.