Replace super() with direct calls