Add remote content handler block & removed unused consume product codes