removing unwanted files
Fixing oversight in merge