Search: Compilation cuck cleanup