Remove some expanduser and abspath calls