Thanks for this. Cleans up a lot of clutter.