Remove PathExpression classes