Fix #9 initialization and delete issue

Signed-off-by: Janet Jin <janet.jin@turn.com>