remove unused files and isse issue