Why this long commented out block? Perhaps either restore it or remove it?