Clean up for public release