Clean up: Dead Code and Shorten domInfo Usage