cleanup, remove redundant code.
cleanup, remove redundant code.

OnBeep/FakeIt,marco-m/FakeIt,eranpeer/FakeIt,eranpeer/FakeIt,OnBeep/FakeIt,skizzay/FakeIt,jvff/FakeIt,jvff/FakeIt,bowlofstew/FakeIt,skizzay/FakeIt,amerry/FakeIt,amerry/FakeIt,marco-m/FakeIt,bowlofstew/FakeIt