Rework JBMini Settings Part2: Cleanup 1