More files to remove and NTP fixes