undo dependency changes + always use core if not disabled

undo dependency changes + always use core if not disabled #159