reverted change mistakenly included from the branch
continued implementing erasing