remove legacy code
remove legacy code