remove unnecessary line
add gurad setting