Revert "Minor Updates"

This reverts commit f342cf19b64bff850e4f4724754ad044fa636e80.