New ST calculation method cleanups

Also-by: Weiss David <david.weiss@in-tech.com>
Signed-off-by: Reinhard Biegel <reinhard.biegel@in-tech.com>

Author: ReinhardBiegelIntech