Cleanup For P4
Cleanup For P4