Some cleanup and trying to get SA to work. No avail.