Deleted some unused code