Remove unused foders
Merged