Removal implemented, that was a hard one