Tmss code cleanup part 7 front end only

Reinder Kraaijrequested to merge
TMSS-COde-Cleanup-Part-7-Front-End-Only into master

Additional Code Coverage Added Some Clean Ups

Merge request reports