Remove old code with for Yamler switching in tests