Include comment saying when it was deprecated, so we can easily find it and delete it during the correct release?