good point! todo removed