Revert "some things"

This reverts commit 2eb8dc86e78836800fc261f5eddb9a07e3f31007.