move "modules" state out of Context
remove unused import