Whitespace cleanup
Removed obsolete path replacements