Cleanup requiring of modules
Simplify confusing unless conditionals