Remove duplicate code
Remove directory not needed