Removing unnecessary references causing warnings in some setups.