Context switching
Cleaned up unneeded code
Merge remote-tracking branch 'contributor/connectionfix' into pr338