Remove unused file inclusions
Function description correction

"Client" -> "Master"