Remove legacy functionality

Core/common macros removed.