clear code
remove redundant code