Merge "Remove defunct secure FS work"