More yay removal