Cleanup and added OreCore to dependencies.