Major TODO cleanup.