taken of some unused code