Fixing bug on sockets
Remove useless views
Merge branch 'develop'