Search and Profile cleanup
Search and Profile cleanup