Cleaning, before refactoring
Merge branch 'connect'