FileHandle.h cleanup