Skeleton clean-up