I think this macros are also unused now.