validator: todos for to cleanup