Revert "added some expansions"

This reverts commit 0a6cd5f862f41a276d064cae67e53d030b9155da.