Remove prefix support
Make connections public