Removing the resources of step 5
Merge branch 'dev'