removed extra macro