removed some unused code