Removed some commented-out code and adjusted a TODO to a FIXME comment.

AFDP-112