remove unused classes and fix parameterListOperator