Revert "Stop-Watch"

This reverts commit edee2bef8dd228a0b3ae6116bbe9c27bd6026ca6.