Remove path modification for added flexibility.