deleting some unused code