make up for the title
remove legacy code