Minor: unused stuff deleted.