Added Utilities, Cleanup