Cleanup of NTFS  code