Need write test case
remove unused files