cleanup
compling support for raw connections