Clean up namespace definitions
Setup Step 1
Setup Step 2
Setup Step 3
Setup Step 4