removed relatively dead code