removed unneeded code, reinserted penis

penis
fixed merge conflict, cleaned up startListening()