Some STBC cleanups

Remove some useless STBC parts and make code more readable