remove duplicate
rename; stop with dirty commits