Took out some debug code, and changed to new core location.