requirements cleanup (hopefully)