Removed some unused macro definitions