[TASK] Round of updates to leave skeleton state