Removed obselete code giving compiler warnings.