Removed core
More changes