Clean old comments (already implemented)

Removed commented lines from the source code
because already implemented in begin file.

Change-Id: I3917c9353dd39853b68d1f854af05e0d1e99f471
Merge "Clean old comments (already implemented)"