removed unused method
use MAC parameter in all object exceptions