Cleanup
Adjusted requirements