Remove custom short pathname code.
Whitespace & comments cleanup.