[WIP] remove deprecated code for 0.16

To be merged after 0.15.