Remove variable where we can #126