Clean up for public