Cleaning up old code for v1 release

Signed-off-by: Peter Thiessen <peter@midokura.com>