Yeah it would have been better that way. I'll remember to get rid of them when I do 2.5 => 3.0 merge :)