Removed references to dead code