Removed requirements from some modules
Dirty merge