Cleanup code from VFS classes