Some cleanup and removed some SOPs I was using.