simplify removeNewResultsListener
simplify/deobfuscate more code