Cleanup and elimination of relative paths