Revert "add code to new core"

This reverts commit 37ea4b9309d0291aeceb494904d70881afe4e0a7.
fix