I think things are working ok now?
try to comment out things.  clearly still not working