diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftNoteBlock.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftNoteBlock.java
index 403c6d00d7..0851ad31ba 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftNoteBlock.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftNoteBlock.java
@@ -20,9 +20,8 @@ public class CraftNoteBlock extends CraftBlockState implements NoteBlock {
         note = (TileEntityNote) world.getTileEntityAt(getX(), getY(), getZ());
     }
 
-    @Deprecated
-    public byte getNote() {
-        return note.note;
+    public Note getNote() {
+        return new Note(note.note);
     }
 
     public byte getRawNote() {
@@ -33,11 +32,6 @@ public class CraftNoteBlock extends CraftBlockState implements NoteBlock {
         note.note = n.getId();
     }
 
-    @Deprecated
-    public void setNote(byte n) {
-        note.note = n;
-    }
-
     public void setRawNote(byte n) {
         note.note = n;
     }
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 7cc9e82a16..7c97c845e1 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -132,14 +132,6 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         return teleport(destination.getLocation());
     }
 
-    public void teleportTo(Location location) {
-        teleport(location);
-    }
-
-    public void teleportTo(org.bukkit.entity.Entity destination) {
-        teleport(destination);
-    }
-
     public List<org.bukkit.entity.Entity> getNearbyEntities(double x, double y, double z) {
         @SuppressWarnings("unchecked")
         List<Entity> notchEntityList = entity.world.b(entity, entity.boundingBox.b(x, y, z));