removed a few leftovers
fixed connections