remove todo's, old imports, etc