fix
removed dead code
fixed rename