Merge pull request #735 from micmac1/restund-remove