Irwin path cleanups