(core) Delete unused code