Minor file changes to use new stop functionality and remove un-required lines

Change-Id: Idc1c39e850df8ad1cd3dd9baf591b113857b5da9