feature/IN-489: Removed comment statements.