Requirements cleanup