Small todo add and cleanup effort.