fix warning, remove redundant stuff