Removed unused method and macro.