Remove deprecated code

- Remove some deprecated code marked as "will be deleted in 0.5"
- Change some others to "deprecated since 0.4", so we'll delete it in 0.6
Removing deprecated code: incorporate comments