Vpc refactor clean for pr

maybe wait with merging untill 4.5 is branched of. On the other hand we cn branch below this refatoring as well