rmeoved dead code