Karl - Removed some dead code.