More requirements cleanup