SImplefy STBC handler v4

i needed to make one more update. I noticed current build system is not braking on warnings. So i didn't tested if there any warnings. THis update make sure there is no more warnings.