Fixing search issue and removing cruft