Remove bloat, update socket communication