Cleaned up fragments left from old search