Fixed cleanup with alternative injection