Clean roll back changes

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