Remove unnecessary folders 2