More bugfix in Step 5 and small modifications of the cleaning step