Revert "Some minor cleaning up [ci skip]."

This reverts commit b66ae7e0bbf2faf6c22d26e0607084467e048c8a.