Cleaned up S3tmo

Change-Id: I5a6a01d3afe1d358738c7be31f8061cd7c0af4ad