removed this visitors and added their behaviour to a single visotor. I feel like this simplifies the flow, reduces the ammount of errors and makes debugging easier.