Added UC6 S3 - Search for HCP
Removed unused steps.