Cleanup
Dont use git protocol
Merge fix