remove pythonpath tweaks, change loc of #15 patch