updated to 2.x
delete unused files