Remove completed #TODO
Modify step defintion