Issue #3293603: Remove useless use statements, update comments and set protected access for modules property.
Closes #3293603