Finished commenting out the extra search fields.