Removed obselete variables