possibly performance-killing easification
removed 'TODO'