-removed dead code