Updated for 13w09c, removed unused functionality