Clean up the skeleton