Remove duplicate steps implemented elsewhere