Revert "simplifications"

This reverts commit e70dc59bdd4449f3a8443052046dc18cda0afd1a.