Remove SkeletonBuilder (this will be done in another branch)