Revert "minor cleanup work"

This reverts commit a9b9ed8236ee26890127feecc4057b5bc393d1d7.
upgrades