Revert "small changes, may need to resolve"

This reverts commit e64bd3d6012be38f463340d60a611a6ef4e0cd32.