Fix bug and remove unused data.