Clean up for public consumption