removed deadcode... -sai