Removed some unneeded utilites.
More cleanup