Remove some temporary working code that has been commented out.