Remove core includes