Requirements cleanup
Prepare for setup