EHO-206 cleanup and spec added