Clear some TODOs by removing unused steps