Deleted some unused stuff