Search and cleanup

@tsanko