Refacoring, removed StatementPreparerOperation