SImplefy STBC handler v3

this is new version of this patches. I needed to unused variable which was left after my clean up