Remove core specific code