Removes unused folders
Some fixes