improve code<br />remove dead code