Revert "Small cleanup commit"

This reverts commit 885f7f4ab0f0fb21a3237d93e0a77a6bacdcfc47.
git commit cleanup