Clean up code
Merge remote-tracking branch 'origin/ExpeSias' into yrmt_sockets