Code Cleanups.  Remove dead & commented out code blocks