Remove DEBUG_LOG usage

Collapes conditional

Remove old comments

Change-Id: Ifb7280f711b67b466f623e31de205bbd06292269