modular: removed unused variables