Many unused deprecated code parts were dropped