MOAR hardcoded path removal