align with latest main and revert unneeded changes