MainPage and SearchResultPage cleanup