removed unused macro and debugs