PATH cleanups