Removed static callback mechanism