Merge: lib/socket: remove BufferedReader superclass