Remove core dependency