removing dead code
marked core as no test