Remove unnecessary requirements
Add XS modules as recommendation from the migration pod