diff --git a/src/main/java/org/bukkit/WorldCreator.java b/src/main/java/org/bukkit/WorldCreator.java
deleted file mode 100644
index f8c9a92f1..000000000
--- a/src/main/java/org/bukkit/WorldCreator.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package org.bukkit;
-
-import java.util.Random;
-import org.bukkit.command.CommandSender;
-import org.bukkit.generator.ChunkGenerator;
-import org.bukkit.plugin.Plugin;
-
-/**
- * Represents various types of options that may be used to create a world.
- */
-public class WorldCreator {
-    private final String name;
-    private long seed;
-    private World.Environment environment = World.Environment.NORMAL;
-    private ChunkGenerator generator = null;
-
-    /**
-     * Creates an empty WorldCreationOptions for the given world name
-     *
-     * @param name Name of the world that will be created
-     */
-    public WorldCreator(String name) {
-        if (name == null) {
-            throw new IllegalArgumentException("World name cannot be null");
-        }
-
-        this.name = name;
-        this.seed = (new Random()).nextLong();
-    }
-
-    /**
-     * Copies the options from the specified world
-     *
-     * @param world World to copy options from
-     * @return This object, for chaining
-     */
-    public WorldCreator copy(World world) {
-        if (world == null) {
-            throw new IllegalArgumentException("World cannot be null");
-        }
-
-        seed = world.getSeed();
-        environment = world.getEnvironment();
-        generator = world.getGenerator();
-
-        return this;
-    }
-
-    /**
-     * Copies the options from the specified {@link WorldCreator}
-     *
-     * @param creator World creator to copy options from
-     * @return This object, for chaining
-     */
-    public WorldCreator copy(WorldCreator creator) {
-        if (creator == null) {
-            throw new IllegalArgumentException("Creator cannot be null");
-        }
-
-        seed = creator.seed();
-        environment = creator.environment();
-        generator = creator.generator();
-
-        return this;
-    }
-
-    /**
-     * Gets the name of the world that is to be loaded or created.
-     *
-     * @return World name
-     */
-    public String name() {
-        return name;
-    }
-
-    /**
-     * Gets the seed that will be used to create this world
-     *
-     * @return World seed
-     */
-    public long seed() {
-        return seed;
-    }
-
-    /**
-     * Sets the seed that will be used to create this world
-     *
-     * @param seed World seed
-     * @return This object, for chaining
-     */
-    public WorldCreator seed(long seed) {
-        this.seed = seed;
-
-        return this;
-    }
-
-    /**
-     * Gets the environment that will be used to create or load the world
-     *
-     * @return World environment
-     */
-    public World.Environment environment() {
-        return environment;
-    }
-
-    /**
-     * Sets the environment that will be used to create or load the world
-     *
-     * @param env World environment
-     * @return This object, for chaining
-     */
-    public WorldCreator environment(World.Environment env) {
-        this.environment = env;
-
-        return this;
-    }
-
-    /**
-     * Gets the generator that will be used to create or load the world.
-     * <p>
-     * This may be null, in which case the "natural" generator for this environment
-     * will be used.
-     *
-     * @return Chunk generator
-     */
-    public ChunkGenerator generator() {
-        return generator;
-    }
-
-    /**
-     * Sets the generator that will be used to create or load the world.
-     * <p>
-     * This may be null, in which case the "natural" generator for this environment
-     * will be used.
-     *
-     * @param generator Chunk generator
-     * @return This object, for chaining
-     */
-    public WorldCreator generator(ChunkGenerator generator) {
-        this.generator = generator;
-
-        return this;
-    }
-
-    /**
-     * Sets the generator that will be used to create or load the world.
-     * <p>
-     * This may be null, in which case the "natural" generator for this environment
-     * will be used.
-     * <p>
-     * If the generator cannot be found for the given name, the natural environment generator
-     * will be used instead and a warning will be printed to the console.
-     *
-     * @param generator Name of the generator to use, in "plugin:id" notation
-     * @return This object, for chaining
-     */
-    public WorldCreator generator(String generator) {
-        this.generator = getGeneratorForName(name, generator, Bukkit.getServer().getConsoleSender());
-
-        return this;
-    }
-
-    /**
-     * Sets the generator that will be used to create or load the world.
-     * <p>
-     * This may be null, in which case the "natural" generator for this environment
-     * will be used.
-     * <p>
-     * If the generator cannot be found for the given name, the natural environment generator
-     * will be used instead and a warning will be printed to the specified output
-     *
-     * @param generator Name of the generator to use, in "plugin:id" notation
-     * @param output {@link CommandSender} that will receive any error messages
-     * @return This object, for chaining
-     */
-    public WorldCreator generator(String generator, CommandSender output) {
-        this.generator = getGeneratorForName(name, generator, output);
-
-        return this;
-    }
-
-    /**
-     * Creates a world with the specified options.
-     * <p>
-     * If the world already exists, it will be loaded from disk and some options
-     * may be ignored.
-     *
-     * @return Newly created or loaded world
-     */
-    public World createWorld() {
-        return Bukkit.getServer().createWorld(this);
-    }
-
-    /**
-     * Creates a new {@link WorldCreator} for the given world name
-     *
-     * @param name Name of the world to load or create
-     * @return Resulting WorldCreator
-     */
-    public static WorldCreator name(String name) {
-        return new WorldCreator(name);
-    }
-
-    /**
-     * Attempts to get the {@link ChunkGenerator} with the given name.
-     * <p>
-     * If the generator is not found, null will be returned and a message will be
-     * printed to the specified {@link CommandSender} explaining why.
-     * <p>
-     * The name must be in the "plugin:id" notation, or optionally just "plugin",
-     * where "plugin" is the safe-name of a plugin and "id" is an optional unique
-     * identifier for the generator you wish to request from the plugin.
-     *
-     * @param world Name of the world this will be used for
-     * @param name Name of the generator to retrieve
-     * @param output Where to output if errors are present
-     * @return Resulting generator, or null
-     */
-    public static ChunkGenerator getGeneratorForName(String world, String name, CommandSender output) {
-        ChunkGenerator result = null;
-
-        if (world == null) {
-            throw new IllegalArgumentException("World name must be specified");
-        }
-
-        if (output == null) {
-            output = Bukkit.getServer().getConsoleSender();
-        }
-
-        if (name != null) {
-            String[] split = name.split(":", 2);
-            String id = (split.length > 1) ? split[1] : null;
-            Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin(split[0]);
-
-            if (plugin == null) {
-                output.sendMessage("Could not set generator for world '" + world + "': Plugin '" + split[0] + "' does not exist");
-            } else if (!plugin.isEnabled()) {
-                output.sendMessage("Could not set generator for world '" + world + "': Plugin '" + plugin.getDescription().getFullName() + "' is not enabled");
-            } else {
-                result = plugin.getDefaultWorldGenerator(world, id);
-            }
-        }
-
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/util/Vector.java b/src/main/java/org/bukkit/util/Vector.java
index a46b6a0d6..dd5d38ca3 100644
--- a/src/main/java/org/bukkit/util/Vector.java
+++ b/src/main/java/org/bukkit/util/Vector.java
@@ -2,7 +2,6 @@
 
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.configuration.serialization.ConfigurationSerializable;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -16,7 +15,7 @@
  *
  * @author sk89q
  */
-public class Vector implements Cloneable, ConfigurationSerializable {
+public class Vector implements Cloneable {
     private static final long serialVersionUID = -2657651106777219169L;
 
     private static Random random = new Random();
@@ -634,33 +633,4 @@ public static Vector getMaximum(Vector v1, Vector v2) {
     public static Vector getRandom() {
         return new Vector(random.nextDouble(), random.nextDouble(), random.nextDouble());
     }
-
-    // UPDATE 1.0.5
-    public Map<String, Object> serialize() {
-        Map<String, Object> result = new LinkedHashMap<String, Object>();
-
-        result.put("x", getX());
-        result.put("y", getY());
-        result.put("z", getZ());
-
-        return result;
-    }
-
-    public static Vector deserialize(Map<String, Object> args) {
-        double x = 0;
-        double y = 0;
-        double z = 0;
-
-        if (args.containsKey("x")) {
-            x = (Double) args.get("x");
-        }
-        if (args.containsKey("y")) {
-            y = (Double) args.get("y");
-        }
-        if (args.containsKey("z")) {
-            z = (Double) args.get("z");
-        }
-
-        return new Vector(x, y, z);
-    }
 }