Deleted some unused stuff...