Revert "tsk29 Adds fixes to some code errors"This reverts commit e7247822639f7d40ae06c59662fc40b99ba5e10c.