Remove unneeded code

Core now takes care of this properly
Properly pre-cache selectors, prevent scope leak