updated to use version 1.9.4-SNAPSHOT of core; removed unnecessary includes