Revert "Minor changes"

This reverts commit e53a5bb9d5850c0b89e9a6c9f22a2a7e960b5ce9.
Revert "Minor changes"

This reverts commit 8bcd1cf09ed3f24d4a29ba1b7c271c064f73fb48.
Revert "Minor changes"

This reverts commit 838f3dfeaa678b73793d2084b074b1c9da3ca2da.
Revert "Minor changes"

This reverts commit 712a01a1bf2789cf12f6b13fa0929f30a1550d3f.