More cleaning, remove connection added