Cleanup of utils and adding noop