Revert "Some changes"

This reverts commit 50002032e119ad59132280caa1230cbc83b3e3de.