Remove deprecated. Improve comments.