Revert "D6-3: add support and test cases for different kinds of comments and empty statement"

This reverts commit 236c162629205eecb3296110f136ec96aa0d0295.
D6-3: add support and test cases for different kinds of comments and empty statement