Fixes #48 using appropriate cleanup commands

Signed-off-by: Madhu Venugopal <madhu@socketplane.io>