remove todo helpers, change default states