Code clean-up of TODO(bajtos)

Resolved TODO(bajtos) issues.