Remove some commented out code
Remove a no-longer needed debugging action