remove todo's for style check