Removed some redundant code
Removed some redundant code

henn/haas,henn/hil,henn/hil,henn/hil_sahil,apoorvemohan/haas,apoorvemohan/haas,meng-sun/hil,kylehogan/hil,meng-sun/hil,kylehogan/haas,SahilTikale/haas,kylehogan/hil,henn/hil_sahil,lokI8/haas,CCI-MOC/haas,SahilTikale/switchHaaS