Drop global class, change to static member