Removed graceful shutdown from stop function

Change-Id: I096908b683e54360c053f263c424c95c25e9b134