Remove deprecated

Next release should remove all deprecated code from 0.2