Cleanup

Removed dead stuff and put connection URIs in one place