Fix test issue
Remove unused files