More cleanup and hook up GoInstant.