Remove superfluous usr check and adjust comments