Cleanup and FILE_ROOT env lookup