Added some cleanup code to rchroot and rupdate