kill legacy comments
rename
rename func