Minor tweaks
Remove #CURRENTPATH# statements