removed unnecessary remnant files
removed unnecessary remnant files2
merged stuff from antagomir
Build checks OK