Removed deprecated code :crocodile: