Removed some comments/TODOs

Signed-off-by: Neil Guzman <nguzman@redhat.com>