Yep, sounds good to me. I removed a few more similar cases.