Removed some (no longer used) commented code