Cleanup search

Also remove other extraneous stuff.