REFAC: seperate input and target dependencies

Current: The target variables needs to be also included in the input variables.

After REFAC: The target variable is not required to be part of the input variables.