Cleanup OC_Setup 

Do a bit of cleanup on the setup code