removed unused code
automerged files
minor fixes
merged