Some Cleanup and MapQuestSearch Removal