cleanup after merging with Samsung sources