can the TODO be removed, or is this still applicable?