This is to remove unnecessary tearDown to keep code clean. Change-Id: Ie70e40d6b55f379b0cc9bc372a35705462cade8b