More rework. Deleted things I don't know why are there.