remove unused files
update class behavior
update wrapper