@klamping Removed the impacted code b/c it is no longer necessary.