CODE: Remove deprecated code of yore