removing unused code
rename
rename
added missing next argument
cleanup