Add delete step
Merge branch 'master' into solution