remove ArgEntry and TODOs that are no longer needed