382.03 Cleaning up new callback structures