Revert "Small Changes to Debug"

This reverts commit f4023887374ddbc47b1a7073adb569926280822d.