Rework JBMini Settings Part3: Cleanup 2