more code clean and file removal