Theme Engine: Code clean up
Remove unneeded code brought in from cherry pick.
Includes a few other adjustments as well.