Delete unneeded files & logging
merge upstream and fix confilct