Removed unrequired core and fix some bugs.