Post-merge commit 2

Removed some unnecessary files, synced some more