@jansepar shouldn't we clear these comments out?