Remove chunk optimization