Clean up various things in requirements