Removed weird hooks into the framework. Replaced with the TraceValueHandler
minor cleanup