Remove macaddr hack