File cleanup in various places, fix issue with File Path and Directory Path nodes