add 4.7 flag
Cleanup