Removed traces of AMO search (bug 1005371)