[#32] finished removal in this issue