Clean up teleport commands, remove unused methods in teleport handler