rhbz953734 - clean up