Removed an unsed variable and used an unused macro