Revert "fixing modal problems and refining gts"

This reverts commit d856ade2e69503f5202549423464ef20c75836b6.