Clean up Skeleton and World