remove prepareBuffer overlap
deprecated annotations
minor change to PlanBinding