Revert "Updated files after merge"

This reverts commit b3885beeca626242215a4809eed2cd633af65aeb.
Fixed broken commits