Prepare for target open logging

Cleanup unused code
Add MC reference into TargetRequest