diff --git a/README.md b/README.md
index 738b8d6..7a45f8a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# java-driver  ![Driver Status](https://img.shields.io/badge/status-alpha-db975c.svg) [![Build Status](https://travis-ci.org/bblfsh/java-driver.svg?branch=master)](https://travis-ci.org/bblfsh/java-driver) ![Native Version](https://img.shields.io/badge/java%20version-8.131.11--r2-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.8-63afbf.svg)
+# java-driver  ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/java-driver.svg?branch=master)](https://travis-ci.org/bblfsh/java-driver) ![Native Version](https://img.shields.io/badge/java%20version-8.131.11--r2-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.8-63afbf.svg)
 
 
 
diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index f40db6e..0000000
--- a/TODO.md
+++ /dev/null
@@ -1,35 +0,0 @@
-This driver is in alpha stage,
-there are still many things that need to be done.
-
-This document aims to give an overview of things
-that still need to be implemented to have a complete driver.
-It will hopefully get empty at some point in the future.
-
-During the normalization stage,
-the driver uses [JDT](driver/normalizer/jdt/jdt.go)
-to analyze and annotate the native AST.
-
-Ideally, we should have all these elements both properly annotated and tested.
-Annotations are handled by [annotations code](driver/normalizer/annotation.go).
-The status of the annotations support is documented within that code.
-We also have some samples in the [tests](tests) dir.
-Since there's no code where to document the status of these samples,
-we're docummenting it here.
-
-## Node types
-
-Currently we have samples that generate most of the native node types,
-but there are some missing:
-
-* BlockComment
-* LineComment
-
-Comments are not provided by default by the native driver. This should eventually be fixed.
-
-## Structural properties
-
-TBD
-
-## Keywords
-
-TBD
diff --git a/manifest.toml b/manifest.toml
index 229944b..a503578 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -1,5 +1,5 @@
 language = "java"
-status = "alpha"
+status = "beta"
 
 [runtime]
   os = "alpine"