Code clean-up

-Removed legacy switch pin