Merging connection cleaner

Merging the connection cleaner thread into the message receiving thread.