Clean up SuperSearchView code