Merge "Remove unnecessary clean up of targets" into sc-v2-dev