Minor cleanup

Removed commented out old statements, some early debug logging