Revert "Add all code of e90"

This reverts commit 11dc61f539a1faf0545b3bc228fd5ea23086bf98.