Added rmdir and hostid