Remove line not used and rename