Remove Old Debug Code