Cleanup for public consumption.