some cosmetic commits and delete duplicate files