General Cleanup (we had two image folders!), etc...
Also, commented out a few more noisy trace statements (DERP, missed them last commit)