Requirements clean up