Clean up for initial release