Remove duplicated directory
code clean up