[FIX] Chip sel functionality changed, Cleanups