Remove custom connection stuff