removed useless files, fixed method arguments