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

This reverts commit 5c22c16917e7b9d7c6885ccba09c6443043d2c1f.