Remove retired variable
Stop triggering module cleanup twice