removing broken functionality, promising some nice searches