bit of cleanup and restoration