Rmeove dead code