Remove unnecessary modules
Add required attribute