cleanup and adding items back in