remove wrapper
rename node
remove unused