stray filesystem code from merge