simplify
Migrate to cedar stack