-removed some unused code