Removing utilities which underscore already has
Cleaned up unused code