Revert "AvdP - Not a good place, but committing anyway"

This reverts commit aa6fe350e25ebf6652205584e18d74740e721b12.