Clean-ups and optimisations
Working on community socket