Deleting some unused code