Remove old requirement, updating some